From: IOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Date: Wed, 8 Nov 2017 22:02:38 +0000 (+0100)
Subject: Force-disabled embedded zlib/jpeglib
X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1~1^2~158
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=0d4148ab877470a4d5e809436ba81d3c0d139987;p=juce.git

Force-disabled embedded zlib/jpeglib

remove other Debian-specific defines onliy needed for the defunct libjuce0
---

diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch
index d1a270c1..a4c7e0df 100644
--- a/debian/patches/debian_fixed-defines.patch
+++ b/debian/patches/debian_fixed-defines.patch
@@ -12,35 +12,37 @@ Last-Update: 2016-04-07
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- juce.orig/modules/juce_core/juce_core.h
 +++ juce/modules/juce_core/juce_core.h
-@@ -65,6 +65,28 @@
+@@ -65,6 +65,21 @@
  
  #include "system/juce_TargetPlatform.h"
  
 +/** Debian specific constants
-+Debian's libjuce.so only allows to either create
-+- a proper Release build
-+OR
-+- a proper Debug build.
++  - Debian, we don't use embedded libraries
 +*/
-+#ifdef JUCE_FORCE_DEBUG
-+# undef JUCE_FORCE_DEBUG
++#ifdef JUCE_INCLUDE_ZLIB_CODE
++# undef JUCE_INCLUDE_ZLIB_CODE
 +#endif
++#define JUCE_INCLUDE_ZLIB_CODE 0
 +
-+#ifdef JUCE_LOG_ASSERTIONS
-+# undef JUCE_LOG_ASSERTIONS
++#ifdef JUCE_INCLUDE_JPEGLIB_CODE
++# undef JUCE_INCLUDE_JPEGLIB_CODE
 +#endif
-+#define JUCE_LOG_ASSERTIONS JUCE_DEBUG
-+
-+#ifdef JUCE_CHECK_MEMORY_LEAKS
-+# undef JUCE_CHECK_MEMORY_LEAKS
-+#endif
-+#define JUCE_CHECK_MEMORY_LEAKS JUCE_DEBUG
++#define JUCE_INCLUDE_JPEGLIB_CODE 0
 +/** Debian specifics END
 +*/
 +
  //==============================================================================
  /** Config: JUCE_FORCE_DEBUG
  
+@@ -124,7 +139,7 @@
+     specify the path where your zlib headers live.
+ */
+ #ifndef JUCE_INCLUDE_ZLIB_CODE
+- #define JUCE_INCLUDE_ZLIB_CODE 1
++ #define JUCE_INCLUDE_ZLIB_CODE 0
+ #endif
+ 
+ #ifndef JUCE_ZLIB_INCLUDE_PATH
 --- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
 +++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h
 @@ -24,6 +24,30 @@